airoha: remove duplicate AN7581 PHY patch
authorChukun Pan <[email protected]>
Thu, 18 Sep 2025 14:30:18 +0000 (22:30 +0800)
committerChristian Marangi <[email protected]>
Mon, 29 Sep 2025 10:05:09 +0000 (12:05 +0200)
This patch already exists in generic/backport-6.12.

Fixes: 122135b ("airoha: an7581: add support for kernel 6.12")
Signed-off-by: Chukun Pan <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20190
Signed-off-by: Christian Marangi <[email protected]>
target/linux/airoha/patches-6.12/060-v6.16-02-net-phy-mediatek-add-Airoha-PHY-ID-to-SoC-driver.patch [deleted file]

diff --git a/target/linux/airoha/patches-6.12/060-v6.16-02-net-phy-mediatek-add-Airoha-PHY-ID-to-SoC-driver.patch b/target/linux/airoha/patches-6.12/060-v6.16-02-net-phy-mediatek-add-Airoha-PHY-ID-to-SoC-driver.patch
deleted file mode 100644 (file)
index 8b7067e..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6a325aed130bb68790e765f923e76ec5669d2da7 Mon Sep 17 00:00:00 2001
-From: Christian Marangi <[email protected]>
-Date: Thu, 10 Apr 2025 12:04:04 +0200
-Subject: [PATCH 2/2] net: phy: mediatek: add Airoha PHY ID to SoC driver
-
-Airoha AN7581 SoC ship with a Switch based on the MT753x Switch embedded
-in other SoC like the MT7581 and the MT7988. Similar to these they
-require configuring some pin to enable LED PHYs.
-
-Add support for the PHY ID for the Airoha embedded Switch and define a
-simple probe function to toggle these pins. Also fill the LED functions
-and add dedicated function to define LED polarity.
-
-Reviewed-by: Andrew Lunn <[email protected]>
-Signed-off-by: Christian Marangi <[email protected]>
-Link: https://patch.msgid.link/[email protected]
-Signed-off-by: Jakub Kicinski <[email protected]>
----
- drivers/net/phy/mediatek/mtk-ge-soc.c | 62 +++++++++++++++++++++++++++
- 2 files changed, 65 insertions(+), 1 deletion(-)
-
---- a/drivers/net/phy/mediatek/mtk-ge-soc.c
-+++ b/drivers/net/phy/mediatek/mtk-ge-soc.c
-@@ -1454,6 +1454,53 @@ static int an7581_phy_led_polarity_set(s
-                             MTK_PHY_LED_ON_POLARITY, val);
- }
-+static int an7581_phy_probe(struct phy_device *phydev)
-+{
-+      struct mtk_socphy_priv *priv;
-+      struct pinctrl *pinctrl;
-+
-+      /* Toggle pinctrl to enable PHY LED */
-+      pinctrl = devm_pinctrl_get_select(&phydev->mdio.dev, "gbe-led");
-+      if (IS_ERR(pinctrl))
-+              dev_err(&phydev->mdio.bus->dev,
-+                      "Failed to setup PHY LED pinctrl\n");
-+
-+      priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
-+      if (!priv)
-+              return -ENOMEM;
-+
-+      phydev->priv = priv;
-+
-+      return 0;
-+}
-+
-+static int an7581_phy_led_polarity_set(struct phy_device *phydev, int index,
-+                                     unsigned long modes)
-+{
-+      u32 mode;
-+      u16 val;
-+
-+      if (index >= MTK_PHY_MAX_LEDS)
-+              return -EINVAL;
-+
-+      for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
-+              switch (mode) {
-+              case PHY_LED_ACTIVE_LOW:
-+                      val = MTK_PHY_LED_ON_POLARITY;
-+                      break;
-+              case PHY_LED_ACTIVE_HIGH:
-+                      val = 0;
-+                      break;
-+              default:
-+                      return -EINVAL;
-+              }
-+      }
-+
-+      return phy_modify_mmd(phydev, MDIO_MMD_VEND2, index ?
-+                            MTK_PHY_LED1_ON_CTRL : MTK_PHY_LED0_ON_CTRL,
-+                            MTK_PHY_LED_ON_POLARITY, val);
-+}
-+
- static struct phy_driver mtk_socphy_driver[] = {
-       {
-               PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7981),
-@@ -1491,6 +1538,17 @@ static struct phy_driver mtk_socphy_driv
-       },
-       {
-               PHY_ID_MATCH_EXACT(MTK_GPHY_ID_AN7581),
-+              .name           = "Airoha AN7581 PHY",
-+              .probe          = an7581_phy_probe,
-+              .led_blink_set  = mt798x_phy_led_blink_set,
-+              .led_brightness_set = mt798x_phy_led_brightness_set,
-+              .led_hw_is_supported = mt798x_phy_led_hw_is_supported,
-+              .led_hw_control_set = mt798x_phy_led_hw_control_set,
-+              .led_hw_control_get = mt798x_phy_led_hw_control_get,
-+              .led_polarity_set = an7581_phy_led_polarity_set,
-+      },
-+      {
-+              PHY_ID_MATCH_EXACT(MTK_GPHY_ID_AN7581),
-               .name           = "Airoha AN7581 PHY",
-               .probe          = an7581_phy_probe,
-               .led_blink_set  = mt798x_phy_led_blink_set,